Two signals (gtk_action_sync_property and gtk_action_sync_sensitive) were

2004-08-22  Philip Langdale  <plangdale@vmware.com>

	* gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
	(gtk_action_sync_property and gtk_action_sync_sensitive) were
	not being correctly disconnected, leading to actions continuing
	to affect disconnected proxies. (#150607)

diff --git a/ChangeLog b/ChangeLog
index 8aecd6375310b8ceaa1e689c598d17c7d95cd705..216d4b624e98f5483f25aeb6ad713b33ff86d331 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-22  Philip Langdale  <plangdale@vmware.com>
+
+       * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+       (gtk_action_sync_property and gtk_action_sync_sensitive) were
+       not being correctly disconnected, leading to actions continuing
+       to affect disconnected proxies. (#150607)
+
 2004-08-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8aecd6375310b8ceaa1e689c598d17c7d95cd705..216d4b624e98f5483f25aeb6ad713b33ff86d331 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-08-22  Philip Langdale  <plangdale@vmware.com>
+
+       * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+       (gtk_action_sync_property and gtk_action_sync_sensitive) were
+       not being correctly disconnected, leading to actions continuing
+       to affect disconnected proxies. (#150607)
+
 2004-08-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8aecd6375310b8ceaa1e689c598d17c7d95cd705..216d4b624e98f5483f25aeb6ad713b33ff86d331 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-08-22  Philip Langdale  <plangdale@vmware.com>
+
+       * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+       (gtk_action_sync_property and gtk_action_sync_sensitive) were
+       not being correctly disconnected, leading to actions continuing
+       to affect disconnected proxies. (#150607)
+
 2004-08-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8aecd6375310b8ceaa1e689c598d17c7d95cd705..216d4b624e98f5483f25aeb6ad713b33ff86d331 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-08-22  Philip Langdale  <plangdale@vmware.com>
+
+       * gtk/gtkaction.c (gtk_action_disconnect_proxy): Two signals
+       (gtk_action_sync_property and gtk_action_sync_sensitive) were
+       not being correctly disconnected, leading to actions continuing
+       to affect disconnected proxies. (#150607)
+
 2004-08-22  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_new_internal,

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index b3b0557e0ca72758f7bce3a0d7986460470fbae8..b757957169ef08783cc84e36066b3eaa06ca1a99 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -968,12 +968,12 @@ disconnect_proxy (GtkAction *action,
                                        action);
 
   /* disconnect handlers for notify::* signals */
-  g_signal_handlers_disconnect_by_func (proxy,
+  g_signal_handlers_disconnect_by_func (action,
                                        G_CALLBACK (gtk_action_sync_sensitivity),
-                                       action);
-  g_signal_handlers_disconnect_by_func (proxy,
+                                       proxy);
+  g_signal_handlers_disconnect_by_func (action,
                                        G_CALLBACK (gtk_action_sync_property),
-                                       action);
+                                       proxy);
 
   g_signal_handlers_disconnect_by_func (action,
                                G_CALLBACK (gtk_action_sync_stock_id), proxy);